Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handle on waiting (backport #1562) #1680

Merged
merged 9 commits into from
Aug 15, 2024
Merged

Handle on waiting (backport #1562) #1680

merged 9 commits into from
Aug 15, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 14, 2024

Conflict resolved from #1483

This is an automatic backport of pull request #1562 done by Mergify.

@bmagyar @mergify
Handle waiting in Spawner and align Hardware Spawner functionality (#…
0487379 
…1562)

(cherry picked from commit af4b48f)

# Conflicts:
#	controller_manager/controller_manager/controller_manager_services.py
#	controller_manager/controller_manager/hardware_spawner.py
#	controller_manager/controller_manager/spawner.py
#	controller_manager/doc/userdoc.rst
#	controller_manager/test/test_spawner_unspawner.cpp
@mergify mergify bot added the conflicts label Aug 14, 2024
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Aug 14, 2024

Cherry-pick of af4b48f has failed:

On branch mergify/bp/humble/pr-1562
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit af4b48f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   controller_manager/controller_manager/unspawner.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   controller_manager/controller_manager/controller_manager_services.py
	both modified:   controller_manager/controller_manager/hardware_spawner.py
	both modified:   controller_manager/controller_manager/spawner.py
	both modified:   controller_manager/doc/userdoc.rst
	both modified:   controller_manager/test/test_spawner_unspawner.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@codecov Codecov
Copy link

codecov bot commented Aug 15, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 58.24176% with 76 lines in your changes missing coverage. Please review.

Project coverage is 62.23%. Comparing base (c04a16f) to head (8954f5f).
Report is 16 commits behind head on humble.

Files Patch % Lines
controller_manager/test/test_spawner_unspawner.cpp 56.32% 12 Missing and 64 partials ⚠️
Additional details and impacted files 
@@             Coverage Diff             @@
##           humble    #1680       +/-   ##
===========================================
- Coverage   87.00%   62.23%   -24.77%     
===========================================
  Files          97       98        +1     
  Lines        7505    10879     +3374     
  Branches      677     7822     +7145     
===========================================
+ Hits         6530     6771      +241     
+ Misses        688      681        -7     
- Partials      287     3427     +3140
Flag Coverage Δ
unittests 62.23% <58.24%> (-24.77%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
...er_manager/test/controller_manager_test_common.hpp 89.85% <100.00%> (+0.96%) ⬆️
controller_manager/test/test_spawner_unspawner.cpp 57.09% <56.32%> (-41.37%) ⬇️

... and 61 files with indirect coverage changes

@destogl destogl merged commit ade1bdd into humble Aug 15, 2024
11 of 12 checks passed
@destogl destogl deleted the mergify/bp/humble/pr-1562 branch August 15, 2024 18:51
@fmauch fmauch mentioned this pull request Sep 23, 2024
Closed
@fmauch fmauch mentioned this pull request Oct 18, 2024
Open
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@destogl destogl destogl left review comments

Assignees
No one assigned
Labels
conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@destogl @bmagyar